bitkeeper revision 1.1159.195.3 (41a64ad83ICuQZax7lM6dgpa2lYR7A)

sync w/ head.

diff --cc linux-2.6.9-xen-sparse/drivers/xen/blkfront/blkfront.c
Simple merge

diff --cc linux-2.6.9-xen-sparse/drivers/xen/console/console.c
Simple merge

diff --cc xen/arch/x86/domain.c
index c76e14a972a5b37a7f3036aa274ac7445872cd06,4a01d86351208139f88a829f64d8ad2ca543bd35..abf13db88a6b9e9e4a7fbd2a8a32ed0452b4a148
--- 1/xen/arch/x86/domain.c
--- 2/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@@ -524,10 -524,6 +527,8 @@@ static void relinquish_list(struct doma
  
  void domain_relinquish_memory(struct domain *d)
  {
-     audit_domain(d);
- 
 +    struct exec_domain *ed;
 +
      /* Ensure that noone is running over the dead domain's page tables. */
      synchronise_pagetables(~0UL);
  

diff --cc xen/arch/x86/memory.c
index 4147a2c37342d4be636d746f7b7a95cc6d0563b0,5734f45ba95c2ebbd21420bdc60a9ead85e7a205..c46b5ed21064f8fc6a572c8e3f6a9d47de0bc650
--- 1/xen/arch/x86/memory.c
--- 2/xen/arch/x86/memory.c
+++ b/xen/arch/x86/memory.c
@@@ -1295,9 -1295,9 +1297,10 @@@ int do_mmu_update
      unsigned int cmd, done = 0;
      unsigned long prev_spfn = 0;
      l1_pgentry_t *prev_spl1e = 0;
 -    struct domain *d = current;
 +    struct exec_domain *ed = current;
 +    struct domain *d = ed->domain;
      u32 type_info;
+     domid_t domid;
  
      perfc_incrc(calls_to_mmu_update); 
      perfc_addc(num_page_updates, count);

diff --cc xen/arch/x86/traps.c
index 11687c05737b3c7537e033b0c68946c5d31cc7bf,f07740220b4c95be1ae5a7ceafc87e4f8c2915a6..93ee093bcac0d82d34b0733099c24bae79760839
--- 1/xen/arch/x86/traps.c
--- 2/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@@ -815,12 -805,8 +815,11 @@@ long do_set_trap_table(trap_info_t *tra
      for ( ; ; )
      {
          if ( hypercall_preempt_check() )
-             hypercall_create_continuation(
-                 __HYPERVISOR_set_trap_table, 1, traps);
 +        {
-             return __HYPERVISOR_set_trap_table;
 +            UNLOCK_BIGLOCK(current->domain);
+             return hypercall_create_continuation(
+                 __HYPERVISOR_set_trap_table, 1, traps);
 +        }
  
          if ( copy_from_user(&cur, traps, sizeof(cur)) ) return -EFAULT;
  

diff --cc xen/common/dom_mem_ops.c
Simple merge

diff --cc xen/include/xen/sched.h
Simple merge